Congress Reaches Deal On $1.7 Trillion Funding Bill